Skip to content

Add Nix flake support and a NixOS module#743

Open
bogorad wants to merge 6 commits into
MisterTea:masterfrom
bogorad:master
Open

Add Nix flake support and a NixOS module#743
bogorad wants to merge 6 commits into
MisterTea:masterfrom
bogorad:master

Conversation

@bogorad
Copy link
Copy Markdown

@bogorad bogorad commented Apr 1, 2026

Summary

  • add a flake with a package, dev shell, and exported NixOS module
  • add a NixOS module that generates /etc/et.cfg and runs etserver
  • adjust the build for Nix-managed dependencies and document Nix/NixOS usage

Verification

  • nix build path:. --no-link

Eugene Bogorad added 3 commits April 1, 2026 10:49
Keep the flake focused on the supported package path and make the NixOS guide only cover the module-plus-package workflow users need.
@MisterTea
Copy link
Copy Markdown
Owner

@bogorad please fix the ci tests, then we can get this in, thanks!

@bogorad
Copy link
Copy Markdown
Author

bogorad commented Jun 4, 2026

Pushed a0af04c (Fix Catch2 test setup ordering). This moves the BUILD_TESTING option before the Catch2 dependency setup, fixing the include(Catch) / catch_discover_tests configure failure.

Verified on this head:

  • CircleCI connect_to_initial_version: passed
  • CircleCI connect_with_jumphost: passed
  • Local Nix dev-shell configure/build/CTest: 115/115 passed

GitHub Actions for this fork PR are still action_required and need maintainer/admin approval before they can run.

@MisterTea
Copy link
Copy Markdown
Owner

@bogorad I relaxed the approval so you should be able to fly-fix-fly without needing me to approve subsequent commits. You can also run the CI locally with nexos/act. Please get CI to pass then I can merge this

@codecov
Copy link
Copy Markdown

codecov Bot commented Jun 5, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 87.31%. Comparing base (34ae006) to head (6007de6).
⚠️ Report is 2 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master     #743   +/-   ##
=======================================
  Coverage   87.31%   87.31%           
=======================================
  Files          71       71           
  Lines        5368     5368           
  Branches      501      501           
=======================================
  Hits         4687     4687           
  Misses        681      681           

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@MisterTea
Copy link
Copy Markdown
Owner

@bogorad I asked AI to fix this pr (??) and it came up with this: https://github.com/MisterTea/EternalTerminal/pull/758/changes

@bogorad
Copy link
Copy Markdown
Author

bogorad commented Jun 5, 2026

currently testing on my machine, will post an update

@bogorad
Copy link
Copy Markdown
Author

bogorad commented Jun 5, 2026

Pushed 511e61680 to fix the original non-macOS CI failure.

Current state:

  • The original NoVcpkg Build / build-novcpkg-ubuntu-latest-gcc11 failure is fixed.
  • Ubuntu NoVcpkg, Ubuntu/Windows Vcpkg, Linux CI, CircleCI, Codecov, codespell, and formatting checks are green.
  • The only remaining pending checks are macOS jobs.

I do not care about macOS support for this PR, so from my side the relevant CI is passing.

@MisterTea
Copy link
Copy Markdown
Owner

@copilot resolve the merge conflicts in this pull request

@bogorad
Copy link
Copy Markdown
Author

bogorad commented Jun 6, 2026

...and yet no flake/ci in master :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants